diff --git a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
--- a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
+++ b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
@@ -193,18 +193,21 @@ mozTXTToHTMLConv::CompleteAbbreviatedURL
 
   if (aInString[pos] == '@')
   {
     // only pre-pend a mailto url if the string contains a .domain in it..
     //i.e. we want to linkify johndoe@foo.com but not "let's meet @8pm"
     nsDependentString inString(aInString, aInLength);
     if (inString.FindChar('.', pos) != kNotFound) // if we have a '.' after the @ sign....
     {
-      aOutString.AssignLiteral("mailto:");
-      aOutString += aInString;
+       if(inString.Find("..") != kNotFound) 
+       {
+		    aOutString.AssignLiteral("mailto:");
+          aOutString += aInString;
+       }
     }
   }
   else if (aInString[pos] == '.')
   {
     if (ItMatchesDelimited(aInString, aInLength,
                            NS_LITERAL_STRING("www.").get(), 4, LT_IGNORE, LT_IGNORE))
     {
       aOutString.AssignLiteral("http://");
